Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 05:23:56 +0000 (21:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 05:23:56 +0000 (21:23 -0800)

Trivial merge